Revert "Awhole ass load of KT commits"

This reverts commit 583f92cf06892952de991e01f84526f121f8d17e.