This flag is to be used very soon, as above it seems a shame to rip it out, then reintroduce it