Revert "Merge pull request #258 from squarefrog/master"

This reverts commit eaa5f9411b7a52f831868922f78c7253dcaba84a, reversing
changes made to 86486d48c2f357544b48a00ce9e79d03d059f231.