The patch from Scott Moser moves the "search-for-prom_claim'able" routine that