this is just...
Merge pull request #795 from dimagi/crud-hotfix

this is just...