Avoid picking up post-2.6.0 fixes