Revert "Base schema changes and code for split data."

This reverts commit f8937afb79eb490caffe39521d522ef9e6b97232, which was not ready for merge.