Fix for rustc master