While this seems like the obvious solution and also a quick one, I can't help but feel that this is not what they are planning to do. They have spent a lot of time developing the new battle system and it is so big they said they will be rolling it out over 2 months. A solution like this would surely not need such a long time to develop and implement would it?