Revert "Merge remote-tracking branch 'origin/CellForRowSwitch' into FollowFeature"

This reverts commit 254e0598a504ccf37c5e79338113f5ad9194ef53, reversing
changes made to 78bd77dc341d592cbb739ec61ab700121ba63350.