Revert via quilt patch. This does mean missing out on some new features such as opening in new window.