go back in upstream history to accomodate a file rename