Bug 1055934 - Backout Bug 1028532 r=milan