Revert "Add parameter to force client config of port"

This reverts commit 5f62ec1f70a8085a45b1466a7bfefd5954df7342.