Here's a better patch that relies on display-buffer-in-previous-window: