Revert "switch to CM-11 settings app"

This reverts commit 8d138c7899b35ca8e5cbaf45942bcb18c245cc29.