[ci skip] diff housekeeping

Mostly removal of non-required diff introduced by bringing over old
1.21.10 code when resolving conflicts.