As discussed on IRC, this logic should indeed go - just keep the hydrator name, or even just the metadata.