Revert "Fixes to pass test for central server model editing and syncing back."

This reverts commit ec1b97f44f29abddc317855d5bd0a0418d234365.