Revert of "Dynamic port added"