Revert backport 9550 stable7