Revert changes on #36503