Revert "possible fix for issue 930"

This reverts commit 3826a31a87976d996a5b0cef87f7fdb334f33fb3.