Do we want to remove this logic?  I keep flip flopping on it...