Redid firefox/safari fix. Someone's merge undid it.