Revert "This is a follow-up to the discussion in D12882."