New tentative fix for OCamlPro/opam#648