Merge "Revert "KNOWN BAD CHANGE - it should cause lint failures (but doesn't??)."" into main