Bug 866514: reland since this isn't the cause of bug 870002 rs=me a=akeybl