Revert "Revert "klte: partial deunification""

This reverts commit 43f168f41b183d05244114c41402bf186e6f7e74.