Fix difference in FDW / non-FDW queries for Geo::FileRegistry queries

The following discussion from !3259 (merged) should be addressed:

• @brodock commented on a discussion: (+2 comments)

  Yep :-) the refactor made it clearer. I would like to fix this in a separate issue to not delay this too much, but can be the next thing I work after the migration path.

Rather than adding this to the FDW path, I propose we remove it from the non-FDW path. I don't see that it gives us much benefit.