Revert "Issue #717"

This reverts commit 285183a70a2c54c32b3247f1983b0b8b676cf578.