This a worrisome change for existing use cases.  But ignoring that I don't like the extra fetch there.