Revert "Trying to fix #236"

This reverts commit 90080ddacd4bef8484ba7c698a69cf59b1d8e0cc.