Refs #9896 - Revert past 3 commits.

So that I may find out why an unrelated unit test is now failing as a
result of moving these other tests.