Created originally on Bitbucket by mwjackson (Matt Jackson)
Was already merged in Bitbucket before import, marked as merged by the import user
we are not reverting the entire migration to _git in the sys module (#27593), just patching the tests so they pass