backport #953 to Druid 0.6.x