Restore kss functionality that was removed, then reverted, then removed again during some branch confusion. Revertception.

This reverts commit 660dbabcecc10c1b75945bb3a0cb506121f5ea72.