Revert "[Crazy idea] Removing all obviously overriding packages to see what"

This reverts commit 024b37679f0312ac26efa61a2f1aa6ef7e6d27fc.