Revert "Usual stomping through the Makefiles"

This reverts commit c9b5ff7b71a10290fce27b3c7aac78ea538a0be0.