stripping 2.0.0-wip down to update grid-only branch