Ticket 33378, revert changes from 31679