Revert OFLib removal in order to fix Generate Fonts.

This temporarily addresses #1556 until we isolate the specific problem.

This reverts commit cf9cfb11262953b69d6de34e5522eddfde8c7f70.

It might be that the `k` variable incremented here gets used again below.