Revert f595c63bb8 and use -t flag instead.

Another day, another thing learned:

https://code.google.com/p/go/source/detail?r=9f6a7e4c3f62