Revert out EventRegistry changes for now

Seems to break the demo for unknown reasons