My stab at fixing JRUBY-7122