Drop #972814 by @Cody