Revert "Add Back These Flags"

This reverts commit 6250dede4b638162060e64867382bcccbd7e3048.