Revert "Merge pull request #139 from chaizhenhua/remotes/trunk"

This reverts commit 10fd40fb0d06f6c577d870b6f15d2f6e2a3a5b1b, reversing
changes made to 414033aafa94cd50c9b310afd3f164740caccc94.
Merge pull request #579 from zimmerle/revert_139

Revert merge request #139