Reverting changes on Ticket #36760