Revert Settings branch to "jellybean"