undo incorrect fix for safari
Merge branch 'master' into production