Revert PR #6 (#8)