TODO in InternalClientHandler removed.