With the changes in 15a6df52, the test is failing in some configurations. Reverting while I investigate