Issue #76: revert