Revert "Not working Flight Test Changes"

This reverts commit ed1fe9b116f1fd222cb0b1069dbf3f1e924b4e6f.