Revert r465619 and r465623, the use of PORT_OPTIONS and option helpers is incorrect
With hat: portmgr