Comment 12 for bug 1017990

Fix still backports cleanly to master. Adding a pullrequest and targeting to current releases. We might want to revisit this bug during the next dev meeting, it's been awhile.