Revert "Revert "addresses #898 (?)""
Revert "Revert "addresses #898 (?)""

This reverts commit 12454e757bcd284b81f451c97babc05b77d64fd7.

I've tested this on my local, see notes on #898

mercycorps/TolaActivity,mercycorps/TolaActivity,mercycorps/TolaActivity,mercycorps/TolaActivity