[#72442638] Remove this change from this branch