On second thought, let's keep a bunch of these flags how they already
were.

Partial revert of the previous commit.