Move our 2.1.x support to 2.1.2