Revert "merge block&ROW improvements"

This reverts commit 58a621ad02381b20a0387848c50a9c419513f5e1.