2.5 is EOL, so we should consider removing explicit support for it (we can leave implicit support for it though)