Comment 3 for bug 565101

Awaiting testing feedback from Carlos, before committing.