Revert "Merge pull request #59 from rschmukler/this-fix"

This reverts commit dceaccf2ca2c2ff217436404c41f2bf69f7577f6, reversing
changes made to 1d28802e388277a6b75efbaa1589027879df101f.
[Version, hot-fix] working 0.5.11