Revert previous commit due to jruby incompatibility
Test under 2.1.0 and ruby-head