Hold on, going to work a bit of magic here...
Paaaart oooone
Diffs should look a bit nicer now.