Revert PR #110