Revert "Fixes #393"

This reverts commit 42c0f3f6d9b8619fd94551bf7c50ff79eba42c8a.