fix for issue #285
Merge pull request #286 from m8ttyB/flaky

fix for issue #285
Revert "fix for issue #285"

This reverts commit 8950af504b83da798b30e5d5fab04434d35d21b3.