[v6r11] Reverting back just in time client creation