Please remove these changes from these files. I am not entirely sure that they are relevant to this PR.