Revert "Block: Backport ROW to 3.1 ( AndreiLux) and squash commits from faux123s repo"

This reverts commit 8e10a2868f890f33bdf2fc7ee06e95363c68fb0c.
Block: fix build for ROW (AndreiLux)