Drop #980282 by @JoelleLB