Once we merge this, what do you think about dropping `2.1.0` (and `2.0.0`?) to simplify the build matrix?