Revert "Makefile tweaks"

This reverts commit 103a48bea9d33b65cf043a8a4ac085144b2d187d.