Revert "use get_or_None"
Revert "use get_or_None"

This reverts commit 3159a743d78443833dc17faf656f6bbdf537886c.

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq