Merge pull request #970 from rspec/restore_simpler_deprecation_formatter_fix

Restore simpler deprecation formatter fix