Roll backe to r14040(those patches would come later)

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