Comment 110 for bug 681348

Here's a my proposal. This can be done before tomorrows release:
https://bugs.launchpad.net/bugs/1067802