Drop #6060 changes from schema

refs #6060