Revert ""fix" #4039"

This reverts commit 3220f80cbb3529c2da335a59f59c93d00684d5f8.