3607a73700
This reverts commits86fc053269andcebf6aa8fd. The intention is to delay the huge rebuild, as we do have binaries for the non-reproducible builds already.