Revert "sync from server"

This reverts commit 1c3a13f82eafd606db39f852e6fb3ebf6316c4b1.