Revert "Fix #110"

This reverts commit 429c576c1bb2d6c4f0e9c49617a7418e0f218baa.