up to 0.10 and remove socket error hack in test