Revert "Use Gustavoss's flags"

This reverts commit 1abc06737d04f1e714ffdcf477513b3aa8516652.