We need to dispose the original client here - otherwise we leak.