Fix recent cherry-pick
Use our experimental pkgin with statistics
and file search features.