Alex Yatskov
abb3d74142
firefox branch. This reverts commit 30585892b812dbf19c15bd010d6032fffa204c0d, reversing changes made to bd89db4ec5a55e7b08b27a3d736a32e859084aff.