Removed $grid-* vars to complement #a2174ef72f