Don't ruin the commit history