This reverts commit 5df30c1b905edce16f2258e414a0a4afb540d0f1. I must have dreamt the Valgrind logs, reverting this reintroduces no leak, and gets rid of the test failures it introduced :S