Weren't we keeping this flag as "NO" in the codebase, as the build server now overrides it on the command line..?