Revert "Rows and cols should now be variables" (488e87f)