TCPonly now works (in a relatively clean way too).