Retry with a different random port if chosen port is unavailable.
+ Remove unnecessary workaround for a fixed issue.