Why are there unrelated changes like this in the pull request?  It will just make it more difficult for future patches if we make unrelated changes here.