This isn't happening for v1 and will hopefully be easier to deal with in v2.