Do a more intelligent check for Calendar installation. See #782