Removing fix for #910 causing Safari to crash