Revert "Revert "Return original event number""

This reverts commit c850fa70ab56c2768a0f90f325707e976146800a.