VIVO-823 Codify the kluge and call it good.

Merge branch 'feature/MMbroken3' into feature/ModelMakers