Revert "Maybe fix for Issue #436"

This reverts commit abd170e0656d9f505dd42b7da383e7b89c1aa708.