Compatible with recent kombu changes