bug686183-v2.diff
