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