Backed out 6d349e5ae0ed (bug 889157) for JP test bustage