From ec7f96c3693bdde5e6282c311b533f85d510150b Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Fri, 22 Jul 2016 19:01:29 -0700
Subject: [PATCH] Revert "Ensure rspec core is loaded if rspec-rails is."
 (#1678)

This reverts commit 994cb7afa8919c5f4560c8b765867b2aac15c192.

The original fix was never shown to have fixed anything, and looks
to have triggered rspec/rspec-rails#1645 and rspec/rspec-core#2301.

Fixes #1645.
---
 Changelog.md       | 7 ++++++-
 lib/rspec-rails.rb | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index de490e2981..b55974bffb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,10 +5,15 @@ Enhancements:
 
 * Add support for `rake notes` in Rails `>= 5.1`. (John Meehan, #1661)
 
+Bug Fixes:
+
+* Stop unnecessarily loading `rspec/core` from `rspec/rails` to avoid
+  IRB context warning. (Myron Marston, #1678)
+
 ### 3.5.1 / 2016-07-08
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.5.0...v3.5.1)
 
-Bugfixes:
+Bug Fixes:
 
 * Only attempt to load `ActionDispatch::IntegrationTest::Behavior` on Rails 5,
   and above; Prevents possible `TypeError` when an existing `Behaviour` class
diff --git a/lib/rspec-rails.rb b/lib/rspec-rails.rb
index 2c9d71ccd8..69fce3221c 100644
--- a/lib/rspec-rails.rb
+++ b/lib/rspec-rails.rb
@@ -1,5 +1,3 @@
-# Explicitly require rspec-core for weird spring issue, see #1558
-require 'rspec/core'
 require 'rspec/rails/feature_check'
 
 # Namespace for all core RSpec projects.