[mesa-freeworld/f40] Revert "sync with master"