Proposed patch for #2589 to guard against content spoofing.