Arguably we should make this configurable.  Not vital for this fix though.