revert bug #591676 changes