Backed out changeset f5712360fc1a (bug 977167) for inadvertently re-enabling a test