Drop #1151802 by @MariaMindal