Revert "klte: partial deunification"

This reverts commit 34b19e59b89eb84a2c3bdb7e2e590602663ec223.