Bug 1034077 - Backed out revision 1034077 due to fix