Back out bug 844530 (33a5882d9607) for being completely busted (and causing bug 848302). r/a=me

--HG--
extra : transplant_source : %FD%C9B%A6QC%F5O%AF%B0%03%81%AC%93%02%06%5BV%26%B4