Reverted TSIG changes