Backout changesets 8f240265df77 and 1ead7ec99cea (bug 734569) to fix bug 810586.  approval-mozilla-aurora=bajaj

--HG--
extra : transplant_source : %93%15%908%7E%C9%0A%1F%A4%E5%A9%2A%D3%19%86PK%26%7F%D9