Revert "Rev UUID"

This reverts commit 0acc6bc0b129e6be316e4717fd194f96111845f8.
Revert "First try with the old supposedly broken patch"

This reverts commit d3b1a7f8002bbdb7263088e656b4d6cd69f3d691.
New try with suggestion from Pat