Partially revert 3f647bb7797b3e71405c59eb280a4be74305c6b2

refs #6724