In a separate patch because RegistryKeySet is used and the previous "more enchant api" patch is before that.