Why did we start using this flag again?