Revert "Flag"

This reverts commit 94a347ae0014f0e4d504b34b12b9286c3a93efc7.