undo the horror created by the "without slave configuration" test