Reverted per-project settings work until fixed

This reverts commit 675e02e16ff743476bddc6444449fc0db577472f.
Reverted per-project settings until fixed

This reverts commit c94e5aa1cf8fd1ae56fd15fedb8b0bb236b42bc1.
Reverted per-project settings until fixed

This reverts commit 00fa94bc04126d499996ae20383c615faffd01eb.