Fixes #3925 - Prevent UUID to be removed