Back to bug 268