Bug 990876 - Backed out changeset 0a245ee13ce6 for build bustage