nit: can you add a reference to bug 961572 in a comment here ?