Revert hack for ruby 2