Revert "Revert "Hacked clients compatability""

This reverts commit 245a70f5e3b41b540117f42b20a5fa66944439c1.