Revert "Add only the default set"

This reverts commit 1652a23ce9e69574b4eeec9e45287e66b83c19f5.