r25510: Now we're returning the port instead of using a global,