Re: [master] Problematic patch I'm not sure we want to apply