Backed out changeset 9c6dc3897c17 (bug 898136) for breaking SeaMonkey