partial revert of 10f0b21, fixes #111 snafu