Comment 2 for bug 1402921

I'm currently rebasing this on master and adding a bit more sophistication to the branch; it's ready for testing but I'm going to remove the pullrequest tag for the moment until I've actually tested it myself.