Restore Kabari's fix from 7547bfa917fa0958236c191209c51c486cfb2b93.
Restore Kabari's fix from 7547bfa917fa0958236c191209c51c486cfb2b93.

It was trampled in the merge of my feature/reorganize fork.
datamapper/dm-validations,mbj/aequitas,emmanuel/aequitas