Revert "WIP: tunnel id"

This reverts commit 46d8594cb7450b2b8d1c4978302f520f85356ccb.