One other thing about this - I don't have the case that caused this condition to be added in the first place, do we need to do some validation that performance hasn't degraded on that use case before merging?