Revert "merge to 2.16.1"
Merge pull request #835 from ohmage/revert-833-master

Revert "merge to 2.16.1"