Remove hack on account_tx calls. see #346