Bug882655 revert fix