This reverts commit 0bbaacc8 and 2ad56119 which merged 10b1b4a2 (and follow-ups), since that change was reverted in 3ab01550.