Revert "Fix for #142"

This reverts commit 4db26312b21df30f45b69583e76ecc9e258fbaa6.