This reverts commit e4ce92245c96cea9492767d7149eb9e30dee0d16. Buildbots not happy with the tests.
f18