An in progress commit -- kiss is still broken on linux.