Following up on #20926 and #20934, we need to update our grid classes to omit the -xs part from those classes.
-xs
