Revert previous attempts to fix the Ruby 1.8.x regression