Revert "Add state to the event dict lookup."

This reverts commit d2cf479ca76a5ca614c98fbd54de66f614a71002.