Undo ports/165457 to not violate POLA. As far as I knew, the PR
was to test what happened when we did eventually delete these two
ports, not to delete them immediately.
A subsequent commit will add appropriate deprecation messages.
Feature safe: yes (actually no, however, this is to preserve POLA)