Reenabled bugfix for client batchcalls invoking multiple calls to the same method