I thought that we would continue to unconditionally collect base table column indexes used by group by -- and just change how we use them (or, for the short term, "not use them").