Bug 938107 - Backed out changeset 7aff3ce81046 for bustage. r=bustage.