Dropped the use of generateUuid