Another fix for the breakage in removeclient.