Fixes #22307 (closed). Also drops one instance of an outline override as we don't want to be doing that.
outline