Revert "Semaphorisation"

This reverts commit 074e3ed6691eb2b9457f4c34827d05bce7bc3d0c.