Undid some work.

refs #4684

Undid some work.