Removing a repetitive comment and a deprecation warning.

My original pull request #10961 broke a couple of railties tests because it had incorrect functionality in the refactored code. This PR should fix that (the content otherwise is the same as #10961).