Backout 13d9e025fc86 and 3f846b593bcb for bustage (bug 1033560). r=backout