fix merge of scrolltip-enable-opt.patch