Backout 59a4e09dd5ce (diagnostic patch from bug 881018) since it didn't help. r=me