Revert "Merge remote-tracking branch 'origin/tao'"  by Jon

This reverts commit 963434dfcd1c1e0e389d0bea9c9bd0a6e2b95cc0, reversing
changes made to 961a399af7024d91219f673922fe2b244ea8eb4a.

Conflicts:
	trex2/trex2_output.py
	trex2/trex2_tables.py