Revert "remove flags"

This reverts commit bde801e08d9bcc82f55f8dd4ab096df9565d5b79.