https://github.com/heimdal/heimdal/pull/7