Fix up a bad cherry pick