Revert "Server events corrections"

This reverts commit 288fcd9d61537b8fe241dba7abc51c91fe9fc8ab.