Backed out changeset 3500854d791b for test log breakage