Remove unnecessary logic from Context.matchPackages
Remove unnecessary logic from Context.matchPackages

Updates #505

The fix for #505 in #555 was overly agressive, remove the unnecessary parts.

hyper-carrot/gb,constabulary/gb,mopemope/gb,constabulary/gb,mopemope/gb,mopemope/gb,constabulary/gb,hyper-carrot/gb