Undo Safari regression (fixes #117)