Revert "Refs #8632. Fixing some last errors."

Got another conflict that I don't feel like fixing.

This reverts commit 655ba9d6c48090a757adc06f0b3b88b36192651b.