Reverted TSIG changes

Candidate fix for #863