Revert "Fix #295"

This reverts commit 48e14e172fbb281f0f7ec0e6f046238d992e69d2.