Back out 935ac957cfb9 (bug 853138) for bustage
CLOSED TREE