Comment 2 for bug 217232

Marking this as in-progress and assigned to Laney, there is a patch from him already in bug 124230.
Laney, please mark properly bugs you are working on otherwise we risk to waste your and/or other people's time!