Port the UUID fix to the client-side version, closes #235