Reverting UUID change from commit 09e71b6339f6d44e084806ab4da6320f7e68c6c6