Split this off from SuchABot, with git filter-branch