Redo sound commit without messing up ReportCreateEvent.
Let's try again, git is messing up my merges....