Revert "Try a more manual solution"This reverts commit 0ff617deb88d714d34bdc851b028bc07a0d0517c.
Revert "Revertme: fail fast"This reverts commit 16d4aff4837607e0cece6becbab1434130c5ca5e.