dimagi/commcare-hq — pull request #2969 by snopoke (2014-03-25 06:38:35+00:00)
Title: Revert "Merge pull request #2958 from dimagi/revert" and fix it

https://github.com/dimagi/commcare-hq/pull/2958