Generally speaking this file has moved around a lot for no reason, it makes it hard to see what has really changed. I appreciate your tooling might have done this, but its still a PITA :-).