Revert changes to multi_tx. I didn't mean to check them in.