Fixes Bug 916905 - removing unique uuids and dates