Backed out changeset 3a61a6eb04d6 (bug 1055821) for build failures