Drop #985542 by @Burnasso