Revert changes introduced by issue #86