[Druid] take a look at this again