Returning to no-semaphore version