Revert "Revert "Revert "case 2: merging settings from CM is no longer a good idea"""

For fuck's sake. 

This reverts commit aa46863bfd92872e706a91b99217efe8378a1a26.

Change-Id: Iae383f4b527233335ff1da5b7a6bbfd21ac3bf3f
Merge "Revert "Revert "Revert "case 2: merging settings from CM is no longer a good idea"""" into kk44