Revert a premature patch for issue #14010 (changeset 846bd418aee5).