Revert "Hacked clients compatability"

This reverts commit 408ffde8b224cc5fb0f51c0629e115996f9a1f7e.