issue #21672: Undo change that broke grid and other things.