Replaced sercer code by client code from 25.11.
Revert "Replaced sercer code by client code from 25.11."

This reverts commit a2e893936532f8c037dd1e1d2eb18206b9773e82.