reverted 2 changes to makefiles