Backed out changeset 8525554ff2ec (bug 1080212) for build bustage