Comment 2 for bug 1680142

Removing pullrequest for now since I accidentally mixed in some changes from another branch. I'll clean this branch up shortly and re-add the pullrequest tag at that time.