fix #1725 (closed)
Should be backported to release-6.6
This will create a new commit in order to revert the existing changes.
