The change in 3d2b80f5f6 broke the test suite, make the fix.