This patch does it in the wrong place then, it should be in the keyword setups themselves. Also, we unset toclient here.