Revert "Merge pull request #119 from nperron/bug_3925/int/prevent_from_having_no_uuid"

This reverts commit 01b3b42aca470c9f2b15018ae3065e1618c9e951, reversing
changes made to 2ee83c8d1eb29602a977b335609baa4e3b72aa30.

Removing a Pull Request not fixing the issue.