Restore support for Ruby 1.8.7