Fixes #7233 - Drop Ruby 1.8.7 and revert Ruby 1.8.7 specifics