Changes for node 0.10.x and to reduce registry call timeouts