Revert "Merge pull request #66 from racker/upgrade-to-1-1-2"

This reverts commit 41853507ea6b688a0b3b06834853ee29cd398802, reversing
changes made to 37ba11e02870d8b423697a07cf6f9619978edf42.