Merge "Partially revert ag/27263995" into main