This reverts commit 94f4c670c1, reversing changes made to 7d5c15469e. refs #10330
94f4c670c1
7d5c15469e