This reverts commit 600e1b6544. The level of hack here is just to high, this destabilizes tests. We need a proper pattern.
600e1b6544