partly revert 3df8fc

fixes #71