This reverts commit 8ea11ec677. It was breaking things, as said by Eelco said in nix-dev: http://hydra.nixos.org/eval/742774
8ea11ec677