Fixing simple schemas generates bad metadata
(cherry picked from commit de79fb2)