Make helper work with backport