UUID patch no longer applicable