This reverts commit 8f7cfc0c73, reversing changes made to cc85ad4b1c. The merge changed stdenv (a bit surprisingly, see #555 for details).
8f7cfc0c73
cc85ad4b1c