revert fde5f789ab9c277cd224cd4b5355690429bff6a0, refs #979