Reverted socketfactory change made ages ago