This reverts commit 2c36c23f. Still problems in the test-suite, which I really thought I had fixed...