Added a temporary option -no-isel-fold-inflight to control whether a "inflight"