Revert backport removal