Revert "Fix some more makefile stuff"

This reverts commit cc31d07b9836637a2854060d3a881fa006a8cc1b.