Remade changes in the Makefiles, since they seemed to magically revert.