Revert "#4403: Update makefile."

This reverts commit cd1cc8b0baa25ba41a10e0ab03ab12ab7121f429.
Revert "#4403: og_vocab patch"

This reverts commit a1e60e2a0b016982dba29c83017e8613fec53cea.