Drop #1058339 by @douglxss