Makes the testsuite pass for now.