Revert "fixes #1653"

This reverts commit 861ade54cf489a46e42388c5c6419023e998ab7d.
fixes #1664