Revert 1 backport too far