backport to non v2 endpoint