commit which doesn't include 6 lines of malformed diffs :p