Revert "tx3g"

This reverts commit d6e2324a9ad040273d0681d436ce1187606914e2.
Revert "bugfix"

This reverts commit 14263059313a5662eed8a659d5047e0c5b3cfb26.