Revert "Changed client timing"

This reverts commit fb1573a64285129a1f6adfce128d9fcd7b218cf3.