Backed out changeset bd71f9da9d7d (bug 990230) for build failures