Backed out changeset 464c8b5a1f28 so we can merge from m-c