Revert "don't wait on the control socket. This might introduce a race, on the other hand I've been experiencing hangs" This reverts commit 21772750.
