fix(registry): Unshadow legacy unit
Merge pull request #395 from bcwaldon/unshadow-unit

fix(registry): Unshadow legacy unit