Revert too-new rustc changes.