Revert "Merge pull request #229 from bjz/fix-build"

rust-lang/rust#19387 is now available in the nighty builds