Comment 2 for bug 1091184

Improved patch, with only the changes necesarry