Backed out changeset e9f86fcb3197 (bug 860934) for build bustage. a=bustage