Backed out changeset 12ee3a176bfe in order to merge m-c