Removing it is the easiest thing to do for now.  When we need, we'll spend the time to think through it (it's probably just going to be a flag).