ENH: more robust backports