Backed out changeset 571a4edc5127 due to test failures.