Updated from commit 2cc4ff465f5479e8893fab46ea77bc2334c846e1.