Did you see my comment on the previous PR regarding this?