Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think.