10 Years Ago
Reapplied fixes from commit 6783