Revert "added a workaround for for #338"

This reverts commit 3ce9770f4fdf362d7087fc023b15e947e5084047.
added a workaround for for #338