Revert "Merge branch 'Prae's-branch'"

This reverts commit 61d5a00c940829aab1e653a8c5724e85da3e5c69, reversing
changes made to 1ecbcae45c1a4c363eeabada13bc59a6942d5140.