phase1: gitcheckout workaround is no longer needed