Revert "Don't mess too much with flags!"

This reverts commit f133f2cfe1a1b8e1d73e52659f54f604abe5b7ed.