backout dc9ebdf27e98 (bug 942657) for bustage