Bug 23307: (RM follow-up) Fix breaking change to columns_settings.inc