Backing out bug 1026302 for build bustage changesets 3e719e2cc1bd and 7a2b642bf77a