Revert "KGW rollback"

This reverts commit 134761ef213a22647a3ba9ae8429ef9bc15d7d86.