Revert "fixes 2344"

This reverts commit a6b5a7802010f4e55f285d592c56fdcffdec4706.
fixes 2344