Revert "Refs #7732 adding a setting to HFIRTestsAPIv2 to see if it cleans up the mess."

This reverts commit 24c4990b5acb6e29d7660c0ee89b703c97766053.