Closes #1758 (closed)
Should be backported to 6.6.1.
This will create a new commit in order to revert the existing changes.
