Revert "Avoid port collisions"

This reverts commit ae0a6e4b2e7b9e88368a3641adc881f9c4a7cf44.