Revert "Fix issue #883"

This reverts commit 78771d875b60ea72e90b5c0bc3ae05fab97f8fca.