A little bit of filter-branch to rewrite history