Merge pull request #1885 from TheBlueMatt/2022-11-dumb-lookup