re-apply backed out enrollment event changes

They were suspected of causing widespread test failures, likely not the cause.

Reviewers: @wedaly, @singingwolfboy