Merge "Revert "Partially revert ag/27263995"" into main