Revert "(partially) fix #139"

This reverts commit 1e1a8932fa22af8bc3dbbd1c81e0d4672079a3e3.