This diff is confusing. In fact, this method was not touched at all (see delete below). What can I do to avoid ugly diffs like this in the future?