Update to work with SchemaSchema 10046e4754a28c998c0134853f275abfd424471b.