r8647: no diffrences between the heimdal and no heimdal case when building