Reopening this bug for Natty. This bug was re-introduced by the last merge which dropped part of the fix.
Reopening this bug for Natty. This bug was re-introduced by the last merge which dropped part of the fix.