Revert handling of horiz_grid_type