rolled back experimental big-grid changes