Backed out changeset 37d19c0c4411 (bug 940844) for a build failure