Revert "Merge branch 'suchintanbranch' of https://github.com/suchintan/FightAndFlight into suchintanbranch"

This reverts commit b079c436051177f1b9171498b9ae1cc3544abfdd, reversing
changes made to 8595af029321f841acf43304d279e497cde567c6.