Revert "Another possible fix."

This reverts commit b74b71c517b47d366d269c88e9d5d38719a8dee1.
Revert "Possible fix for server crash."

This reverts commit 7c290f5fe9f39ce27877e2ed63bdb3b5aae185e6.