revert: rearrange pick_revisions() for clarity