Back to bug 354

No changes have been made to this bug yet.