Issue #5096: Revert