fix #4171

reverts 53efc3a094 for the most part --> draw own conclusions