Bug 912197 followup - fix B2G breakage, round 2; r=bustage