If we're able to fix it before 1.3.0, we'll likely keep the upgrade in there... otherwise might revert it until after cutting 1.3.0