@dbu: this is how core does it which we are following here.