Reverse changes. This refs #6577