When we want a port, take it.
Merge pull request #777 from square/jwilson_0427_kill_pickport

When we want a port, take it.