revert 4.3 changes, this is jellybean branch