Revert "flags update"

This reverts commit b49215ff6ab5b9a395f5d88f61e1489f94a03292.