Gavin: if you get a second, it would be good symmetry to get this along with the blocker in bug 380852
Gavin: if you get a second, it would be good symmetry to get this along with the blocker in bug 380852