Revert csr_row_mode additions