Revert 2d73302..877a837

This rolls back to commit 2d73302b155ce9a1608a5a6fce22c18f1c66c592.
Revert "Revert 2d73302..877a837"

This reverts commit 53981b5ce5c307681cd4272d131e6ed42fef6611.
Revert - tested uuid