Revert "[nit] Changed wait timeout for server"

This reverts commit 49d16dd119fbacb636b26cf2f3bf6332cc959fcd.
That looked a magical constant solution - was disappointed.