Fix bad cherry pick