Revert "Fix issue #1431 (Tx and NoTx used concurrently)"

This reverts commit f1c28586d4b714ecb9fbc6ac04908252aa54ccfc.