Comment 13 for bug 720147

After review the attached branch was submitted to ec2 and had the failures shown in the attachment. I don't have time to follow up so finishing and landing this bug will have to fall back to Graham or someone else.