I suggest looking at this file instead of this little bit confusing diff.