Revert "Better fix for #43"

This reverts commit 96c4388e13e6d540460cd820ddf6bcda158cf5d1.