This reverts commit 28f96bdff0 as it isn't necessary any more after the fix in the previous commit. See #17409.
28f96bdff0