Revert "fixes #4574"

This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.