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