Revert 454dd1a32a97e67037fb6c0afea181e8db07a60f Refs #676