Revert "commit from server"

This reverts commit 8585933b534a24c4518e884c3b4de3ba9c801c27.