Revert "Adjust Makefiles"

This reverts commit aa5de7c2a738a865139a6bf6e5fbc14a63a87f6b.