Revert changes to Makefile

This partially reverts commit 3e977da5ea81dfd8266f3099160630a0bb8ca32a.