Bug 1082446 and 1079115