Backed out changeset a3337bda5a22 (bug 995972) for mozbuild test failures.
CLOSED TREE