revert kw fix causing problem in cfgi