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