Backed out changeset 9f9e83390b46 (debugging patch for bug 991600) because the problem with the test was identified