[#1369] [#156] Revert "Fixed #156." as it brakes client tests
[#1369] [#156] Revert "Fixed #156." as it brakes client tests

This reverts commit 0ff7b346294b133c0932389bfa645b0d80015c46.

AndreyZM/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge