Merge "Revert "Unwrap HTML loaded from parser cache""