Comment 6 for bug 1806709

Thanks Jason for making quick work of this! I still think it needs to go into 3.1, though, since the incomplete change went in there also. Unless you had a reason against that?