Copied the synth-from-dnssec fix from !591 (closed), after removing the part duplicated in !805 (merged).
synth-from-dnssec