This reverts commit 779191cd4b. Conflicts: src/librustc/middle/trans/base.rs src/librustc/middle/trans/common.rs
779191cd4b