Restore 2.5 support for the time being