Reapply change from 9768a89, which accidentally got reverted
Reapply change from 9768a89, which accidentally got reverted

Note to self: Always merge and don't just copy over, even in cases where
it seems simple.

sdx23/khal,pimutils/khal,hobarrera/khal,geier/khal,pdav/khal