Fix inability to create usable event registrations
(cherry picked from commit 14d578e)