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

This reverts commit 2d44a941941085d5b309ffaac49547338af6f607, reversing
changes made to 6f90ba2a1f6c2c0b1265c131eb02230cf7f516ed.
Revert "Revert "Merge pull request #1 from mangoszero/Rel20""

This reverts commit bc96260b97c4e6f094c634efe89150b8578a7bad.