Revert 068f092ced8483e557725542dd919ab7c516e567

Fixes #17209.