Revert "Fixes #230"

This reverts commit a359ca6d0b7f0e2fc96782b5267a8af2536d9b1d.