The patch removes the conditionals that add the spurious SOA.