This reverts commit c1ef87e8d0. I didn't realize that it would rebuild all linux stdenvs; I certainly don't want to incur such a rebuild at this point.
c1ef87e8d0