Fix work-breaking in FireFox

Change-Id: I10ccecb9a0fdfe0484667b85703ab0e4b5dd8062