Backport legacy helpers