Reapply the fix to avoid duplicate xmlns bug