Revert "Fixed typo."

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

This reverts commit 5c073ff429bee6519fbd728c60152ef05b4879db.