backout f370e521f004 (bug 879658) for b-c bustage

--HG--
extra : rebase_source : faa6901a5da3f65feb7db0c12c8657d7704bbbc5