Revert "Fixed typo."

This reverts commit 3459505b5176dc5875d071ceb90e511c31269de8.
Revert "Fixed bug#9387 - Error in a condition with dynamic fields in NotificationEvent."

This reverts commit 1407217be5292149d71c718180515c423224613d.