Revert accidental commit in [21066]