CONN-1444: Reverted back part of the event logging code
Merge pull request #954 from nareshcgi/CONN-1444A

CONN-1444: Reverted back part of the event logging code