Had to revert some stuff to avoid errors during port deletion