Revert "good save point"

This reverts commit 5ff00b910414cd86b50d5ec57b02246ae8e8174b.
Merge branch 'commcare_2.18' of https://github.com/dimagi/commcare-odk into commcare_2.18