Backed out changeset 3c72c5ea486c (bug 957721) for breaking mach on non-Mozilla-Build python installs