This reverts commit 33247237af, reversing changes made to 37aeb83cd9. refs #3436
33247237af
37aeb83cd9