Revert "KoE Updates"

This reverts commit 1ae0182ec7453e5cbfea2963b3e87c18b1c0e199.