Revert "Track our own Settings again"

This reverts commit ffb0d6115b92c8d14dd3c1d13e1fcd906c9c1428.