Rolled back the last change to allow this to continue to work with Ruby 1.8
Merge pull request #415 from cdearborn/pull-req-master-63f3dc46387ae788fc99e32981591419f34cff4a

Backed out Ruby 1.8 breaking change [1/1]