This reverts commit e5272d9b. Reverting to fix validate regression, and pending a redesign of the changes.