Make sure we only return the plugins we want here even if others are unpacked.
Merge bug 26375 (again)