Comment 15 for bug 261595

Nominating this for tb3, possibly not a huge amount of work.