I don't think we need this flag at all.