Back to bug 274