Restore Ruby 1.8.x compatibility