Revert "Tweaked Row"

This reverts commit 721ab715c8807304ecd74e8025d1c5ae31ff2fc1.
Merge branch 'cm-10.1' into governors