Back to v1 of TransactionSynchronizer rewrite