Reverting a pull request and observing the consequence.

Revert "Merge pull request #1 from tonyjiang/testa"

This reverts commit c2d461267ba44aa9544d59e934c22d6849c82462, reversing
changes made to 83e31477eb76c01153945bd7efd21f257c48583d.