Now I'm really confused--this PR reverts the changes to the schema made in the other PR....