Back out df0f69fc244f (bug 933030) for bustage
CLOSED TREE