[mesa-freeworld] Revert "Add workaround for -freeworld build"