@RWOverdijk can we drop this logic then?