This reverts commit 9b2bff7097. It fails to build: http://hydra.nixos.org/build/27428175/nixlog/2/raw
9b2bff7097