Revert "Use gevent wait for ... wait"

This reverts commit db035d842c614d7c66e4ce5fff8251fce251520b.

Obviously Ubuntu's gevent wait method is somewhere else.