Revert "Merge pull request #2958 from dimagi/revert"
Revert "Merge pull request #2958 from dimagi/revert"

This reverts commit 5214f2862e4cd58cfc5f79f5050f84cdbf8ec916, reversing
changes made to 6038175e6b91718226f2301d26c5377d58e9c773.

dimagi/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,SEL-Columbia/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,puttarajubr/commcare-hq,SEL-Columbia/commcare-hq,puttarajubr/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,puttarajubr/commcare-hq,SEL-Columbia/commcare-hq,qedsoftware/commcare-hq,puttarajubr/commcare-hq