Reverting back just in time client creation
Merge pull request #1907 from atsareg/fix-v6r11

[v6r11] Reverting back just in time client creation