Revert to using flag everywhere