Wip client umount

Maybe save that for a later commit (I already tested this)?  There will be more service-restarting fun down the line I expect