Fix PR4080 has been reverted.  Update Changes accordingly.
Fix PR4080 has been reverted.  Update Changes accordingly.

eliberis/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,yunxing/ocaml,eliberis/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,msprotz/ocaml,eliberis/ocaml,yunxing/ocaml,yunxing/ocaml,yunxing/ocaml,eliberis/ocaml,yunxing/ocaml,gerdstolpmann/ocaml,eliberis/ocaml,msprotz/ocaml,msprotz/ocaml,gerdstolpmann/ocaml