Refs #10061 rollback
Refs #10061 tests now completing locally