Comment 5 for bug 810626

Agreed. We'll get this done before the production deployment.