All the changes in this file appear to be whitespace, with no actual changes for this PR. Can we get this separated from these set of commits?