Revert "Still experimenting with port control"

This reverts commit 7e3b43304213c2e2fb89a0710b14c4422f6d94f4.