Bug 1104198 take 3