Revert a couple of commits
https://github.com/upndwn4par/android_packages_providers_ThemesProvider/commit/4456de181af115c60aac4696639dc70e162882ce
https://github.com/upndwn4par/android_packages_providers_ThemesProvider/commit/8ff5a8cd6aa1fe64a1f3ee63cade6ed8d8acc439