revert changes for ticket 2869