Back to bug 954