Back out 5bf9771e1a28 (bug 860029) for bustage
CLOSED TREE