DO NOT MERGE LIKE THIS

Bodge klogind support