Revert "Fixed UUID string issue"

This reverts commit be94b039508ea47dcd1805cdd669cd974ab6e100.