This reverts commit 40143fb6.

The patch prevents future compatibility if migration ever learns
how to do tunnelled without p2p.