Revert tcp optional

This PR wasn't meant to be merged yet (and apparently break some things and created ugly warnings).