Drop #972080 by @RichCaldwell