Drop #977038 by @CorinaObertas