Back to bug 6587