Upgrade to rustc aaf141d39 2014-09-07
Remove work-around for Rust issue 16597.

https://github.com/rust-lang/rust/issues/16597