ENG-6467: Adding comments to the canonical DDL made things unhappy.
Revert for now.