revert flags

Change-Id: Ia773d512034f5342113b2e2da314ee80b5417355