Back out fix for issue #13886; it introduced a new bug in interactive readline use.
Back out fix for issue #13886; it introduced a new bug in interactive readline use.