Revert "Enable Advanced Settings"

This reverts commit 04379008e9d2b9698627f5a9dc5061cbe62e1bac.

Change-Id: Ia5b80f024679541e0fdb2f1fc17bfc04b67d8e91
Merge "Revert "Enable Advanced Settings"" into jb-mr2