v5.8.16 - remove strange default values introduced in commit
db4d1793933eb181feee7d79679b6ff0f5867250