Back to bug 217