Also removes the files from lint, so that the new indentation doesn't obscure the change. The files are reindented in the next commit.
James Rowan