[Pki-devel] Hack to build on F16