Reinstate uuid and node in since values

BugzID: 21658