Remove this part of next uuid support [...]

This part will be re-added in a next commit, for the 4.0