Revert "Merge pull request #2 from mangoszero/Rel20"

This reverts commit 567fdcba082434cd2d45f8a3843e9ce71af95300, reversing
changes made to 0bddac1034de805d65d4f00eb6321fa4d502f495.