Revert "Merge pull request #263 from dongweiming/tmp"

This reverts commit 36feeb1d399aecac10cca3e25838ee7d9992865e, reversing
changes made to 10d4068aa29089bcdf264f303bb80d20e8176789.
Undo last merge