Guarantee a failure rather than rely on time

Undo all previous attempts to fix this
Use channels to force a proper failure