fix #23366
 4th batch

some more fixes and some reverts.