This reverts commit e0b6cf7b41. In the next commit, I will add a different fix for this issue. [MAILPOET-5833]
e0b6cf7b41