Revert "MASSIVE DODO DETECTED"

This reverts commit 36e4911c87bf4d94396c96db628d106a607d45e2.
Revert "Comander build arm fixes"

This reverts commit 503e7799288cab029fb17c915fc245a4f330c8f0.
Apporaching the problem form different direction

Simpler solution brought to you by liquius,