Revert "Makefile tweaks"

This reverts commit cbe14d33a12e44115ef4e12853b3f30e2deb6943.