Revert "kokoa: change rewiring"

This reverts commit 68b178ebb622ba832678344d2abd406df662650e.