Revert "ROW updates"

This reverts commit fb8f85842483d71ece0477ca48f392108bdf6f03.