Revert "ocamlbuild plugin: Improve the workaround for PR#6186"

This reverts commit c65bf98d88a4e65f1c399c507687cc9c02ba1467.