Remove this hunk please. Do the same with the whitespace changes in the file below.