Update for rustc f168c12c5