Backed out changeset 398bdeea30b0 (bug 1037892) for build bustage