Rolled back r176719 because settings with file
names were broken.

<rdar://problem/13422580>