Revert "Registry (Part 1)"

This reverts commit b5df473c52431d63aacc12606c2224a35cdd8f94.