Revert "attempt at navigation to new transaction"

This reverts commit 98a83982eadbbdd3dad0351a85ce3b7e908baf2d.
reverted and fixed conflicts