Time to say goodbye to explicit backport support (part deux)