Merge "Recover a handful of commits that were reverted earlier"