Let's just drop assured 2.5 compatibility, it simplifies code