This reverts commits 86fc053269 and cebf6aa8fd. The intention is to delay the huge rebuild, as we do have binaries for the non-reproducible builds already.
86fc053269
cebf6aa8fd