Comment 7 for bug 1571721

Based on Gustavo's comment, I'm marking this verification-done instead of verification-failed; it may not be a complete fix but it's a significant bugfix and improvement.