Revert "BF: changes needed for new kb event field defs"

This reverts commit 4e51cd8f25878bc96819054f6b3bc633176dec32.