Note: not hooked to the build; likely the last port that needed fixup for the uuid naming change. Amit Kulkarni had the same diff, ok aja@ sthen@