Already did a lot of the work for Unix sockets. Hate to see it wasted.
Slightly un-doing the unix-sockets code for the time being.