Remove lingering uuid4 invocations
Merge pull request #566 from edx/sanchez/remove-uuid4

Remove lingering uuid4 invocations