Reverts the FLYBY change and baby-proofs the UI #17655

Job	Run time
Compile Maps	1m 17s
Run Linters	1m 36s
Find Maps to Test	11s
Windows Build	2m 14s
Unit Tests (corsat) / run_unit_tests	6m 44s
Unit Tests (chinook) / run_unit_tests	6m 13s
Unit Tests (almayer) / run_unit_tests	7m 59s
Unit Tests (bigredv2) / run_unit_tests	6m 15s
Unit Tests (fiorina_sciannex) / run_unit_tests	6m 42s
Unit Tests (desert_dam) / run_unit_tests	6m 19s
Unit Tests (ice_colony_v2) / run_unit_tests	6m 15s
Unit Tests (kutjevo) / run_unit_tests	6m 31s
Unit Tests (lv522_chances_claim) / run_unit_tests	6m 10s
Unit Tests (lv624) / run_unit_tests	6m 16s
Unit Tests (new_varadero) / run_unit_tests	6m 47s
Unit Tests (prison_station_fop) / run_unit_tests	7m 2s
Unit Tests (runtime) / run_unit_tests	6m 32s
Unit Tests (shivas_snowball) / run_unit_tests	6m 15s
Unit Tests (sorokyne_strata) / run_unit_tests	6m 18s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	6m 33s
Alternate Tests (515, 1610, lv624) / run_unit_tests	5m 59s
Check Alternate Tests	1s
	1h 56m 9s

Provide feedback