VID-2079 reverting git clusterf