Backed out changeset e87724022bc1 (bug 1043558) a=ryanvm (feature bustage)
Bug 1043558: merge m-c backout to inbound. a=ryanvm
CLOSED TREE