Revert "Restore Ruby 1.8.7 compatibility"

This reverts commit e29af783bbc4b162f067342c6da0506fe3e84e0e.