Revert "Possible kb fix"

This reverts commit e5f2dc863509902649864ad37839505c6ce296be.