[Unmarked attached patch as a solution, since it's now included in natty and is just a temporary fix.]
[Unmarked attached patch as a solution, since it's now included in natty and is just a temporary fix.]