Revert "Removing xkms"

This reverts commit 640857fbe022f5f82a0e470c83ad37d226a3368f.