Revert: Update some Makefiles

This reverts commit 0381f1b975fecd4a7618d8fcfe7bc077d4166f3a