This reverts commit 607c28ea38 and c43f385e67. Some builds hang, as they did with 1.1.0. http://hydra.nixos.org/build/2963125
607c28ea38
c43f385e67
preConfigure' to