Revert "Fix #594"

This reverts commit 7970e75da1f4827df95187b81800e27d9bffb0f4.