Scratch that; I think this is covered in cd78b1c.