I stupidly didn't cherry-pick my follow-up commit to 4.2. Switching to fix version to 4.2.7 to account for that...