Revert "squashed commit of row updates from caf"

This reverts commit 1468be07ae5777051d1306791a7ab89e56849a9a.