Drop #974304 by @dougfriesen