Revised the fix on the 8.6 branch; will merge fwd.