Merging to a different branch

Reverts NamTThai/PokemonShowdownAndroidClient#60