This reverts commit607c28ea38andc43f385e67. Some builds hang, as they did with 1.1.0. http://hydra.nixos.org/build/2963125
This reverts commit607c28ea38andc43f385e67. Some builds hang, as they did with 1.1.0. http://hydra.nixos.org/build/2963125