This reverts commit f517c62fde, reversing changes made to d1fd7e4be7. refs #10704
f517c62fde
d1fd7e4be7