[#50154295] Revert more unneeded changes