Back to bug 1041

No changes have been made to this bug yet.