#6582: make backport of #5904 more backwards compatible. (Cherry-picked from trunk, commit 15414.)

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02