This is in preparation for coq/coq#9274.
Again, should be backward compatible but I haven't tested.
This will create a new commit in order to revert the existing changes.
