Backed out changeset 3cde3e356720 for build errors.