Fix f860e0bd Firefox failures
(cherry picked from commit 0a3a424e65f66414305bf6a34fc6fd93d3b61c62)