Revert "Merge pull request #43 from facebook/yiding/reduce-build-test-overhead"

This reverts commit bf1c27b0363b48379cbb680ab9c27ebf2dc474ca, reversing
changes made to ae51679c32ca723771a1431653c4c2aa0b002303.

forgot to update tests