Revert "Merge branch 'master' of https://github.com/IndigoShowdown/Pokemon-Showdown"

This reverts commit 0ecadbcd15d93cd5a737fabf647fbcba0802ea52, reversing
changes made to 15a7eaee51161f30f9a0133f78aa0f1ea3de72ba.