Edit strongly-typed UOW to an aggregated UOW
Revert "Edit strongly-typed UOW to an aggregated UOW"

This reverts commit 3b72c019fdc2a1540d1da5e41e133eec1133e809.
Change in DB values