Revert "Merge pull request #1674 from dimagi/reverting"

This reverts commit a238faeb8d6a4124a6a5364066b4db51201f2ebc, reversing
changes made to a92e5779c6adf581cd98401933844e6588e69916.
Merge pull request #1675 from dimagi/reverting

Revert "Merge pull request #1674 from dimagi/reverting"