This reverts commit 54b60ba6. As requested by Sven. Not needed as we now have fixed the testchannels issue.