This reverts commit 617dfdef9e. It turns out this might conflict with our bright testrunner future.
617dfdef9e