it probably makes sense to do this here, but then we should remove all other places that do the same. i will have a look and do a new pr.