Revert "Merge pull request #993 from dimagi/comment-out-stale"

This reverts commit 5d43c1a26d1ea03b10c0a9766fab64441e773833, reversing
changes made to 8a38cb3a895e5cd6e16601581331a70adfb58f41.
Merge pull request #996 from dimagi/revert-hotfix

Revert "Merge pull request #993 from dimagi/comment-out-stale"