Bug 1034581 - Backed out 0b4aba67fb19 due to fix in Firefox