Adding the socket-fallback that was removed on master.