Revert "Fix bug #4355"

This reverts commit f860e9aac0d947a048988b70ac92624f5e454f96.
Fixing #4355, second try