This reverts commit 5eb2e9aa. This broke MacOS builds, needs to have a safer check guarding the flag addition.