Revert "Fix for #237"

This reverts commit 6e1ac5d701f05dc40e7fd291f2339e608a816536.