9a386574d8
This reverts commit 208feceb0398d6c6b4e397563b9aa2eda2573590. Changes requested in the PR not made. Such a change requires discussion on the list first.