I'm not sure how the changes in this file relate to this PR. Were these changes included intentionally?