[patch] uuid: don't break entities without uuid support.