Revert "Drop #6060 changes from schema"

This reverts commit 4c8064569e17085401aa2a14df91b7245478a038.