bug 834620 - back out 0542a2f3c2f33274a90082011a13ef5d8a8c315f because bug 841251 hasn't landed yet