This reverts commit fdb4663ca1.
fdb4663ca1
This reverts commit b800cf189f.
b800cf189f
[MAILPOET-4082]