Revert "merge to 2.16.1"

Reverts ohmage/server#833