Revert back to using only Flags