Drop #1075303 by @Michael