Spoke with @dianakhuang and this was done when the scope of changes was expected to be small. Arguably this does not belong in the opaque-keys work but undoing it would be more trouble than it is worth.