Reverted BattleController to master version.