Revert to the Wheezy workaround to reset a domain.

I'm still running our test suite in a Wheezy VM, and I guess most of us will be
doing the same until Jessie is released, so let's get back at this later.

Partially reverts 05c9e69d.