[#1911] Add support for legacy client.