Comment 6 for bug 1460521

No need to land this in Wily, it's already in 0.12-3.