Revert changes for now. refs #4179