On second thought, let's make that part of bug 844032 ?