[upstream] Change back to newest upstream repo