Revert "Merge pull request #145 from dimagi/items"

This reverts commit 0dc7f8e517043e586aabc23f95f3ef4eceb6df71, reversing
changes made to 8312f1a4e4637dce9eef1da19eda3451435442d0.
Merge pull request #148 from dimagi/revert-items

Revert "Merge pull request #145 from dimagi/items"