Merged into bug 7ec2c071-9630-42b0-b08a-9854616f9144