Restored flags commit