Sorry for this painful commit, but git somehow f'd up and sees changes in files where there aren't any.