revert schema changes to 3d5c38bd27163c1f1546e4ca219a9b5748a19398