Follow changed in rust master