Revert "do not use row for now"

This reverts commit da193f33926de806638cab7556a2de6b09e4459d.