Revert "bug from server :("

This reverts commit 431ab555a257f0088bffb0c4fcf05aa55bf95c0d.