This reverts commit b042ffc4a768c2bd6d7588b1b2f47af22669c2cb. Conflicts: src/librustc/middle/pat_util.rs