reverting change introduced in PR #131