Rollback to android 3.6