This reverts commit 3486135b.

The commit comment ended in the words: "This is needed later."
Apparently the "later" never arrived.