[PATCH 21.5] Ensure correct finder* is used during build