Revert "This is supposed to fix issue #471."

This reverts commit 3878de02dad49b24038cd29838e55e821a648fa0.