Merge "Revert "Do not allow updates to the _data column.""