Revert "Fix for issue 707"

This reverts commit faf7b0f23e2e98911a79e9606c4af40556bc06e3.