Revert "Merge pull request #864 from dimagi/remote-mm"

This reverts commit 60643113eafb8fe7ddd13a62c78160e5d7f6336d, reversing
changes made to 616d86fce8df98b2803b44a2e143f58e16583193.