Backed out changeset 530e36edd321 (bug 968857) for test bustage. a=backout