hulk inclusion
category: bugfix
bugzilla: 16589
CVE: NA

-------------------------------------------------

This reverts commit 703f67f815bc382034f72a0ac8b2e35fcd37688b.
The patch has introduced a bug, revert it and use a new fix.