back out 706fb1750102e304e88c4e00e110342964a145fb and 58ba440425ada6e0f1338c8243c556d9ea8cc870 to stop munging our git shas