Fix backporting of package finders from 2.8.8