Updating missed changes in revision D11198
LGTM
(you probably don't want to delete .gitignore/.arcconfig, though)
Reverted in r242366