Revert back to old schema definitions