Revert "Flight ready - no flight mode"

This reverts commit b4ea771318e712b1668cafbec998314e50528d79.