This reverts commit abc7591aaf, reversing changes made to 6b1ebeccf2, because they broke half the packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further details.
abc7591aaf
6b1ebeccf2