Revert "Makefile Changes"

This reverts commit 8daab1064ab5e76b0d6f7591b7bdc2a5761512cf.