Bug 7392: Follow-up