Comment 4 for bug 514090

The branch I have fixed this on is the 2.1 branch, but its newer than LP has deployed. LP can safely cherrypick the last commit on my branch though, to deploy a cherrypick fix.