Backed out changeset e87724022bc1 (bug 1043558) a=ryanvm (feature bustage)

--HG--
extra : transplant_source : Bd%97G5%05%BC%CD%ADn%3BU%C7%CCFL%C0%D0l%E6
Bug 1043558: merge m-c backout to inbound. a=ryanvm