Sigh, another try at Ruby 1.8.7 compat