fix for upstream changes (version: rustc 0.13.0-nightly (7e11b2271))