A possible way to preserve the feature (which has its merits in some cases) would be the patches attached.

Best, /PA