Back out dc42a14663fe (bug 927226) for either causing or landing on bustage
CLOSED TREE