Revert previous commit to re-apply with the schema change in a separate commit.

This reverts commit b6b83df873a1509797235738e00f9e6307eca876.