Patching 2.1.2 while we are at it