Have you tried rewriting commit history?