Merge "Partial revert of ag/25744360" into main