firefox branch. This reverts commit 30585892b8, reversing changes made to bd89db4ec5.
30585892b8
bd89db4ec5