this change seems unrelated to moving to 2.2+