Kit for #23816 : Nonmayewww cleanup