* tov.py: revert an optimization that lead to incorrect code & results...