Backed out changeset 3368efceb99f due to test failure