Revert "Merge pull request #61 from rails/fix-build"

This reverts commit 52d385a4fac8d71448bb561dfd9b506f4fa026c0, reversing
changes made to 733fedff9da3997f1b98760b948114255f53860b.