Back out a82f3a08ff3a (bug 901644) for being both POTB and soon to be causing orange in mozbuild/test/test_util.py