before i changelog and backport this... discomfitor - look at this!