Revert "Schema updates"

This reverts commit 756e048380db1f098d1d748aeff639d0a79edf41.