I'm fine with this, but since 2.6 is now EOL, we probably don't need it.