Revert "Merge upstream" #680

Job	Run time
Run Linters	2m 16s
Collect data for other tasks	13s
Compile Maps	2m 19s
Windows Build	1m 48s
Integration Tests (deltastation) / run_integration_tests	8m 36s
Integration Tests (gateway_test) / run_integration_tests	9m 30s
Integration Tests (icebox) / run_integration_tests	8m 54s
Integration Tests (multiz_debug) / run_integration_tests	7m 36s
Integration Tests (birdshot) / run_integration_tests	8m 30s
Integration Tests (metastation) / run_integration_tests	8m 39s
Integration Tests (runtimestation) / run_integration_tests	7m 34s
Integration Tests (northstar) / run_integration_tests	9m 30s
Integration Tests (tramstation) / run_integration_tests	9m 33s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 19s
Check Alternate Tests	1s
Compare Screenshot Tests	29s
	1h 32m 47s

Provide feedback